refactor : consolidate env variables #871
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Add comprehensive paths.rs module with hierarchical path management - Consolidate workspace (.amazonq/), global (~/.aws/amazonq/), and application data paths - Replace hardcoded paths in tool_manager.rs, context.rs, and directories.rs - Use structured PathResolver with workspace(), global(), and application() scopes - Maintain backward compatibility while providing single source of truth for paths - Support async Os initialization and proper error handling - Suppress clippy warnings during migration phase This enables easier path management and future rebranding efforts by centralizing all Amazon Q related paths in one location. 🤖 Assisted by Amazon Q Developer
…ntrol Add SC2329 to the existing shellcheck disable comment for the __bp_adjust_histcontrol function in bash-preexec.sh. This function appears unused to shellcheck because it's overridden by a stub function, but it's actually called from within the __bp_install function. Fixes failing init lint tests for bash shell integrations. 🤖 Assisted by Amazon Q Developer
dk19y
force-pushed
the
refactor/consolidate-env
branch
2 times, most recently
from
f5d2995 to
ac90afd
Compare
kkashilk
reviewed
Oct 31, 2025
Contributor
brandonskiser
left a comment
brandonskiser
left a comment
There was a problem hiding this comment.
very minor nit - I would prefer just importing Env etc. instead of qualifying all callsites with fig_os_shim::..., more consistent with the rest of the codebase and more legible.
| static IN_CODESPACES: OnceLock<bool> = OnceLock::new(); | ||
| *IN_CODESPACES | ||
| .get_or_init(|| std::env::var_os("CODESPACES").is_some() || std::env::var_os("Q_CODESPACES").is_some()) | ||
| *IN_CODESPACES.get_or_init(|| std::env::var_os("CODESPACES").is_some() || crate::os::Env::new().in_codespaces()) |
Contributor
There was a problem hiding this comment.
Env::in_codespaces should also check for the "CODESPACES" env var right? So std::env::var_os("CODESPACES").is_some() shouldn't be necessary
kkashilk
reviewed
Oct 31, 2025
|
|
||
| // Q-specific environment variable methods | ||
| pub fn q_fake_is_remote(&self) -> bool { | ||
| self.get_os("Q_FAKE_IS_REMOTE").is_some() |
Contributor
There was a problem hiding this comment.
nit: rename get_os to get_os_env_var
kkashilk
approved these changes
Oct 31, 2025
brandonskiser
approved these changes
Oct 31, 2025
Replace the deprecated CommandCargoExt::cargo_bin method with the recommended cargo_bin! macro to resolve compilation warnings. 🤖 Assisted by Amazon Q Developer
Replace deprecated assert_cmd::cargo::CommandCargoExt::cargo_bin method with the recommended cargo_bin! macro in test files to fix compilation warnings and ensure compatibility with custom cargo build directories. 🤖 Assisted by Amazon Q Developer
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactor/consolidate env variables.